@@ -34,6 +34,11 @@ def tgu_group_user_join_api(request): |
||
34 | 34 |
user_id = request.POST.get('user_id', '') |
35 | 35 |
nickname = request.POST.get('nickname', '') |
36 | 36 |
|
37 |
+ name = request.POST.get('name', '') |
|
38 |
+ phone = request.POST.get('phone', '') |
|
39 |
+ relative_person = request.POST.get('relative_person', '') |
|
40 |
+ remark = request.POST.get('remark', '') |
|
41 |
+ |
|
37 | 42 |
# 获取旅行团唯一标识 |
38 | 43 |
group_id = get_tour_guide_own_group(admin_id) |
39 | 44 |
|
@@ -57,7 +62,21 @@ def tgu_group_user_join_api(request): |
||
57 | 62 |
group_user, created = GroupUserInfo.objects.get_or_create( |
58 | 63 |
group_id=group_id, |
59 | 64 |
user_id=user_id, |
65 |
+ defaults={ |
|
66 |
+ 'name': name, |
|
67 |
+ 'phone': phone, |
|
68 |
+ 'relative_person': relative_person, |
|
69 |
+ 'remark': remark, |
|
70 |
+ } |
|
60 | 71 |
) |
72 |
+ |
|
73 |
+ if not created: |
|
74 |
+ group_user.name = name |
|
75 |
+ group_user.phone = phone |
|
76 |
+ group_user.relative_person = relative_person |
|
77 |
+ group_user.remark = remark |
|
78 |
+ group_user.save() |
|
79 |
+ |
|
61 | 80 |
if group_user.user_status != GroupUserInfo.PASSED: |
62 | 81 |
group_user.current_id = -1 if group.group_from == GroupInfo.SESSION_GROUP else int( |
63 | 82 |
r.get(GROUP_LAST_PHOTO_PK % group_id) or -1) |
@@ -122,10 +141,14 @@ def tgu_group_user_update_api(request): |
||
122 | 141 |
|
123 | 142 |
# 用户信息更新 |
124 | 143 |
# TODO: Whether sync name and phone to UserInfo or not? |
125 |
- group_user.name = name |
|
126 |
- group_user.phone = phone |
|
127 |
- group_user.relative_person = relative_person |
|
128 |
- group_user.remark = remark |
|
144 |
+ if name: |
|
145 |
+ group_user.name = name |
|
146 |
+ if phone: |
|
147 |
+ group_user.phone = phone |
|
148 |
+ if relative_person: |
|
149 |
+ group_user.relative_person = relative_person |
|
150 |
+ if remark: |
|
151 |
+ group_user.remark = remark |
|
129 | 152 |
group_user.save() |
130 | 153 |
|
131 | 154 |
# Redis 群组用户数据缓存 |